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

Fixes #8