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

Fixes #6