Resolves #6