adding media image support
Merge branch 'gh-pages'