Merge pull request #36 from cogniva/test-windows

Get tests passing on Windows
Merge branch 'master' into tip