Merge pull request #95 from deba/nitish

Pulling all changes from Nitish branch
Merge pull request #96 from deba/komal

Merge pull request #95 from deba/nitish