Closes #52
Merge pull request #57 from jpav/master

Closes #52