fix the windows_main, thanks to emily for notifying me :)
Merge remote-tracking branch 'origin/development' into bleeding-edge