UserManager added some code /Gonz
Merge origin/master