Feature/book 594