Merged changes from the main book. Fixed build.