Merge pull request #35 from moonpyk/msbuild

MSBuild rework