Removed davids name from function headers because he doesn't want to be associated with this horrible code.
Merge branch 'master' of https://github.com/rbellido/Project