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

Closes #8