fixes #20
Merge pull request #21 from rcaravita/master

Fixes #20