Merge pull request #6 from xiaosong/master

Auto merge by kpm server