Merge branch 'hotfix/Bug2'
fixbug3
Merge branch 'hotfix/bug3' into ebook