Merge pull request #24 from ashish343/master

Merging.