wkumari Merge pull request #6 from wkumari/Client-behaviour