Closes #90
Merge pull request #95 from jpav/master

Closes #90