Merge pull request #5 from awm/master

Minor MSVC fixes and improvements