Fixes #9
Merge pull request #11 from aiacovella/wip-9

Fixes #9