Fixed build errors in VS2013
Merge pull request #1041 from DanielSWolf/fix-build

Fixed build errors in VS2013