fixes #7
Merge pull request #12 from aiacovella/wip-7

fixes #7