Bugfix for MSVC.
Merge pull request #37 from Fraser999/next

Bugfix for MSVC.