Fix #20
Merge pull request #22 from xPaw/patch-1

Fix #20