Closes #40
Merge pull request #41 from sindice/issue40

Closes #40