added basic support for reading users
fixed merge conflict