Second round of figure improvements

Fix figure box width when the caption exceeds image width.
Merge pull request #13 from magnunleno/improve-images-2

Second round of figure improvements