Added support for embedded non-shell code blocks; added support for figures