Resolves #44