Implemented #88 (better instance names)