Fixing macro definitions
Adding salt to hash function