Cool improvement from Peter

Here is where I try to persuade the project lead to accept my pull request