Merge develop into master

With new feature: book details