tagging
tagging 2 and refactoring codes
Merge remote-tracking branch 'origin/yongkai'