Implements #22