This resolves #4