Merge pull request #4 from zhaijialong/vs2015-fix

VS2015 fix