Closes #69
Merge pull request #73 from jpav/master

Closes #69