Merge pull request #2 from ccforward/master

Auto merge by kpm server