Implements #47