Merged acl2+books