Closes #75
Merge pull request #76 from jpav/master

Closes #75