Merge pull request #245 from yogeshchaugule/develop

Develop - Changes by Yogesh
Merge pull request #246 from yogeshchaugule/design

Merge pull request #245 from yogeshchaugule/develop