Merge of users branch. Improved user object creation.