First merge

I'm happy to announce the code I wrote in the first month of the Summer of Code was merged upstream. You can see the pull request here.