fixes
Merge branch 'users'