Closes #32
Merge pull request #33 from jpav/master

Closes #32