Vanilla: It's planned but I'd rather hold it off until I've tested the OS X build myself (still dealing with Windows).
armoafro: Thank you for the feedback, good eye on the generator issues.