modified by kyoheif.
Merge pull request #2 from kyoheif/kyoheif-fix

modified by kyoheif.