Usability updates
Merge pull request #2 from lvnilesh/patch-1

Usability updates