Implemented #78