Merge pull request #37 from moonpyk/msbuild