For merge with dev
Merge pull request #1 from puneetkaura/feature1

For merge with dev