Merge pull request #57 from richardsheridan/master

Fix MSVC build problems