Resolves #57