Closes #20
Merge pull request #22 from jpav/master

Closes #20