Improve image rendering and add hover text keyword
Merge remote-tracking branch 'origin/master'