Resolves #31