Improves User model once again
Merge branch 'origin/master'