GSoC 2013

Hello,

This is Oliver Hamm doing a pull request with the patched file as requested.