Merge pull request #100 from edrevo/fix-master

Fixes to master so it works on Windows again