user profile, model fix
Merge origin/master