Implements #25