Implements #85