Added HASH_SALT defined variable
Merge remote-tracking branch 'origin/master'