Merging two RPs

Finally I managed to request a PR :)