Windows bug fixes
Merge branch 'master' of https://github.com/PonySDK/PonySDK.git