Closes #68
Merge pull request #74 from jpav/master

Closes #68