Fixes #7
Merge pull request #8 from adinapoli/master

Fixes #7