Merge pull request #76 from kainjow/msvc-warnings

Fix some MSVC warnings