Resolves #59