Closes #28
Merge pull request #41 from jpav/master

Closes #28