Merge pull request #138 from fsb4000/msvc