Merge pull request #1 from yogeshd/master

from fork to client
from client side chagne