Resolves #38