Merge pull request #1 from kmittal/feature

Feature
Merge pull request #2 from kmittal/develop

Merge pull request #1 from kmittal/feature