Merge pull request #249 from raghuvissu/master

address and client change