Resolves #9