Feature/book 591