Resolves #2