Resolves #37