Merge pull request #172 from svost/build-msvc