Implemented #74