Resolves #41