Fixes #105
Merge pull request #107 from aiacovella/wip-working-on-something

Fixes #105