add hookin feature
Merge branch 'f-hookin' into dev
Merge pull request #6 from pjanda/dev

Adding hookin feature
Merge branch 'dev'