Merge pull request #233 from yogeshchaugule/develop

Develop
Merge pull request #234 from yogeshchaugule/develop

Develop
Merge pull request #235 from yogeshchaugule/design

Design changes by Nilesh