Dummy commit
Merge branch 'master' into create_epub
Merge branch 'master' into create_epub
Create EPUB2 - first version: needs answers on TODOs + clean-up