Improve demo image.
Improve demo image and merge origin back into master.