chiuki Merge pull request #590 from catehstn/edition-145