fixes #24
Merge pull request #25 from rcaravita/master

Fixes #24