Closes #62
Merge pull request #64 from jpav/master

Closes #62