refactoring due to hook feature
Merge pull request #12 from zelgerj/master

refactoring due to hook feature