description design
Merge remote-tracking branch 'origin/OMG' into OMG