lots of changes
Merge branch 'master' of github.com:quamis/ebook-helpers