toward pulibrary/pul-store#39, all changes have been made