Merge branch 'master' of https://github.com/daowangli/pictures
Merge branch 'master' of https://github.com/daowangli/pictures