dev
Implemented hooks
Merge pull request #1 from Csson/hooks3

Merge the hook system