Closes #42
Merge pull request #44 from jpav/master

Closes #42