fix pic won't load problem
Merge branch 'master' into gh-pages