Fix pw issue and add Deactivation
Merge branch 'master' of https://github.com/agperez/316