Contribution

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