Merge11
Merge branch 'master' of http://github.com/yandld/CH-K-Test