Fixing bug that firefox doesn't show image
Merge remote-tracking branch 'origin/master'