Added User class
Merge origin/master