Merge branch 'hotfix/bug3'
bugfix4
Merge branch 'hotfix/bug4' into ebook