Few proposals from @hemanth
Merge pull request #3 from hemanth/master

Few proposals from @hemanth