shuping first version
Merge branch 'localKun'
shuping merge
shuping update version two
merge with shuping's first edition
Merge branch 'sp789-master'