Closes #29
Merge pull request #38 from jpav/master

Closes #29