Merge pull request #190 from yogeshchaugule/develop

Develop - Changes by Priyanka and Yogesh
Merge pull request #191 from yogeshchaugule/design

Merge pull request #190 from yogeshchaugule/develop