Implemented #47