Add users class
Merge branch 'master' into development