Merge pull request #99 from deba/kiran

Merging all updates from Kiran's branch
Merge pull request #100 from deba/komal

Merge pull request #99 from deba/kiran