Fix compile errors on Windows
Merge pull request #23 from rod-hynes/master

Fix compile errors on Windows