Fixes #6
Merge pull request #11 from paulrad/dev

Fixes #6