Merge pull request #57 from richardsheridan/master

Fix MSVC build problems
Merge branch 'master' into idea-speedy-microslabs