Commit 78b50a67be6fb40e715132eabe9b05c64ddd99c8

ckitagawa 2020-01-14T11:01:09

Address initial comments