Merge pull request #7 from xiaosong/master

Auto merge by kpm server