Resolves #29