Closes #40
Merge pull request #43 from jpav/master

Closes #40