Closes #61
Merge pull request #63 from jpav/master

Closes #61