Windows bugfixing
Merge pull request #50 from wagnert/0.5.8-beta

Windows bugfixing