Closes #12
Merge pull request #21 from jpav/master

Closes #12