Function headers, grumble grumble...
Merge branch 'master' of https://github.com/rbellido/Project