Implements #38