Major Update for User Management
Merge pull request #27 from echr/Saturday-fix

Major Update for User Management