ready for importing

also fixed minor bugs
Merge branch 'master' of https://github.com/MSmid/markdown2docbook