Another fixes
Merge pull request #80 from yogeshchaugule/design

Design - changes by Emanuel