Bugfix issue #27
Merge pull request #30 from tomasdelvechio/iss27

Bugfix issue #27