Merge pull request #87 from fsb4000/MSVC