Design done
Merge branches 'master' and 'design'