Resolves #71