Merge pull request #469 from kugel-/new_hooks