Fixing #65 - in progress