Merge pull request #1 from ccforward/master

Auto merge by kpm server