merge changes from Ken Takata
updated series