fixes #2'
Merge pull request #6 from aiacovella/wip-2

fixes #2'
Merge pull request #7 from aiacovella/wip-5

Wip 5