User module update
Merge pull request #895 from sexnothing/develop

User module update