Once this is merged into master, then I would entertain another pull request that changes both, but I think it's ok for this PR