Merge pull request #24 from ashish343/master

Merging.
Merge pull request #25 from ashish343/release

Merge pull request #24 from ashish343/master