Fixes #103
Merge pull request #111 from aiacovella/wip-working-on-something

Fixes #103