support other types and png images
Merge branch 'master' into gh-pages

* master:
  support other types and png images
deploy