merge @rclosner's users_show
Merge pull request #158 from c4hrva/users_show

merge @rclosner's users_show