design completed final
Merge remote-tracking branch 'max/master'