Closes #71
Merge pull request #72 from jpav/master

Closes #71