Fix msvc compile errors (issue #230)
Merge pull request #231 from cgohlke/patch-2

Fix msvc compile errors (issue #230)