Merge branch 'pr/25'
Adding the salt part to the hashPassword FN