Implements #37