Resolves #8