Merge pull request #133 from vadz/msvc-warn-fix

Fix harmless but annoying MSVC warnings.