merged pull request #118 の反映