Merge pull request #202 from stef145g/master

Fix MSVC compiler warnings.