Resolves #45