Contributing upstream

Hi,
Here's the pull request. Feel free to amend it in any way you want.
Regards