Closes #53
Merge pull request #56 from jpav/master

Closes #53