BS3 user module update
Merge pull request #754 from sexnothing/develop

BS3 user module update