koki25ando Merge pull request #10 from koki25ando/bug_fixes_for_ver0102