Some more changes.
Merge branch 'master' of https://github.com/HackerSchool-IST/Passport