Merge pull request #99 from fancycode/visual_studio_fixes

Thanks for the contribution.