Improved image handling
Added test asset
Added index.html
Merge branch 'master' into testing