design v.1

design v.1
Merge remote-tracking branch 'origin/master'