Fix some bugs. (eg... no figure is desplayed.)
Merge branch 'test'

Merged! some bugs is fixed.