Implemented #43

Without flaws :3