Fixes #10
Merge pull request #11 from rbartoli/master

Fixes #10