Feature/book 613