Fixing license
Merge branch 'master' into design-tweaks