Merge pull request #1 from songxc/master

Auto merge by kpm server