This resolves #7