resolves #37, resolves #38 at ucanca.org