Implements #31