Closes #80
Merge pull request #84 from jpav/master

Closes #80