fixes #1
Merge pull request #13 from aiacovella/wip-1

fixes #1