some small changes
Merge https://github.com/anil-ninja/teamroom