Closes #30
Merge pull request #36 from jpav/master

Closes #30