Update some descriptions!
Adjusted some descriptions!
Merge remote-tracking branch 'upstream/master'
removed two files merging with Yuri code!