updated v0.8.21
updated v0.9.11
Merge pull request #164 from koichik/master

v0.8.21 & v0.9.11 対応．