Fixed bug in image parsing
Rework of templates

Added
Merge branch 'master' of https://github.com/MSmid/markdown2docbook