Merge pull request #114 from yogeshchaugule/design

Design - changes by Emanuel
minor fixes for warning
Merge pull request #115 from yogeshchaugule/develop

Develop - Changes by Yogesh