Merge pull request #260 from jossgray/master

Fix build on msvc