fix
merge
Merge branch 'master' of https://github.com/yupe/yupe
some fix
Merge branch 'master' of https://github.com/yupe/yupe