Merge pull request #118 from sjanc/windows

Fix build on Windows