Merge pull request #1 from intheway/master

合并原作者更新
forkupdate2
update1junzhan
merge with junzhan