Added Client messages
Merge remote-tracking branch 'nazneen/master'
Bug fixes
Merge pull request #5 from harshhpareek/master

Bug fixes