This is follow-up of #251 I checkout fuminori-ido:feature_240_ohai_8_24_0_issue branch and merged latest master branch.