Closes #31
Merge pull request #34 from jpav/master

Closes #31