Implements #140