Merge pull request #17 from rcaravita/master

Fixes #16
fixes #20