Fixes #98
-- fixed some stuff
-- fixed other stuff
Merge pull request #99 from aiacovella/wip-working-on-something

Fixes #98