2014-05-21
Merge branch 'master' of https://github.com/huanggang/hyd