Renamed hooks according to debian manual standards
Merge branch 'master' into dev
Fixed Unintentional output from 'which'
Merge branch 'dev'