Fix bug about book shelf
Merge branch 'i0' into wip