Implements #20