Merge branch 'ebook' and fix bug
Merge branch 'master' into ebook