Add tips for label
Merge origin/master