Merge from master
Merge pull request #9 from praveenkv/master

Merge pending changes