Topic issue 18

issue #18 の対応