Merge pull request #8 from placasse/FixMSVCCompile