Merged with book2 branch