design updated.
Merge branch 'master' into design