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

Fixes #103