Merge pull request #29 from kkato233/master