VS2013 fix
Merge pull request #806 from SunBlack/master

VS2013 fix