VP82
Fixes #82
-- fixed some stuff
-- fixed other stuff
Merge pull request #83 from aiacovella/wip-working-on-something

VP82