Merge pull request #1 from michaelliao/master

merget origin code
Merge pull request #2 from wangzhizhou2014GitHub/patch-1

modified version
Merge pull request #106 from wangzhizhou2014GitHub/master

wangzhizhou2014GitHub_2