Merge pull request #34 from ChinaPicture/master

Hello Cat
may day may day
Merge branch 'master' of https://github.com/icylydia/zhaohua
Merge branch 'master' of https://github.com/icylydia/zhaohua