I'm glad to hear your suggestion, it's harder to merge upstream at the moment as there are already over 3000 commits.