Feature/book 1013