Pch - rebased with latest master commits

Just reviewed and tested your PR, it's great.
However, please accept this rebase and merge as the `master` branch changed considerably today, so I can accept your PR on the `upstream` repository.

Cheers and thanks, we hope to see more contributions from you.