Merge pull request #9 from pepijnve/master

Generate width and height attributes for PNG images
Merge pull request #10 from pepijnve/master

Generate width and height attributes for SVG image blocks