Add 'figure¨.
Remove wrap.
Merge branch 'dev'