fixes #3
fixes #3
Merge pull request #8 from aiacovella/wip-3

Wip 3