Closes #35
Merge pull request #37 from jpav/master

Closes #35