update
Merge branch 'master' of https://github.com/zhenhui/zhenhui.github.com