Resolves #4