20140424
Merge pull request #18 from duostec/master

20140424
Merge pull request #19 from ChinaPicture/master

1223
Merge branch 'master' of https://github.com/icylydia/zhaohua