Final GSoC pull request