Fixes #7
Merge pull request #11 from drax68/master

Fixes #7