Merge pull request #1 from asikart/staging

Add hooks
Merge pull request #2 from asikart/master

Merge pull request #1 from asikart/staging