Closes #24
Merge pull request #25 from jpav/master

Closes #24