Added automatic figure numbering