Resolves #1