Merge branch 'feature/book' into develop

Need finer grained structure.