Merge pull request #10 from xiaosong/master

Auto merge by kpm server