making review changes #2

Open
idaapayo wants to merge 7 commits from Ida/pbkdf2 into master

7 Commits