Closes #27
Merge pull request #39 from jpav/master

Closes #27