Fixes #24
Merge pull request #25 from josenavas/issue_24

Fixes #24