Fix #25: Implemented