Add description to shake wish
Merge remote-tracking branch 'origin/master'