Rebase on develop
Merge pull request #23 from babausse/enhancements/design

Design enhancements and interface rework