Closes #6
Merge pull request #8 from jpav/master

Closes #6