Closes #47
Merge pull request #51 from jpav/master

Closes #47