Merge pull request #77 from fsb4000/fixMSVC