Fix issue #20
Merge pull request #21 from tomasdelvechio/iss20

Fix issue #20