This resolves #49