Thanks. I've created a new pull request with your suggested changes, all squashed into one commit.