Closes #65
Merge pull request #77 from jpav/master

Closes #65