Fixed some issues with hanging on request
Merge branch 'master' of https://github.com/panickeraj/Project-Chatter