Merge develop into master

Updated hook installation method and minor changes