General updates
Merged windows support and mac os x updates