added users. Expect some debugging with name 'users'
Merge branch 'master' of https://github.com/asgpng/COS-iw