Merge pull request #42 from fsb4000/Fix-MSVC