Fixed msvc warnings
Merge pull request #1 from amc522/master

Fixed msvc warnings