refactor;
Merge branch 'master' of
https://github.com/androidzhaoxiaogang/horse.git