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

Fixes #100