Merge pull request #6 from pjanda/dev

Adding hookin feature