Big update
Merge branch 'master' of https://github.com/brantje/passman