Fixes #6
Merge pull request #7 from jpav/master

Fixes #6