Merge pull request #1 from rajithv/master

Sachini's branch
Commit 1 by Sachini on local repo
changing in CLI
Merge pull request #7 from Sachini/master

Created fork : pull request from GitHub