Author: Kyoko Nakajima (needs-merge-openlibrary)