Merge pull request #21 from wagnert/master

Bugfix for Windows
Merge pull request #22 from wagnert/master

Bugfix missing handler name parameter