Merge pull request #1 from panovr/master

Fix VS2013 compiling error c2899