This should fix most of #2
Merge pull request #3 from wininjob/fix2

Fixed #2