As requested, a pull request of my stable branch