Merge branch 'master' of github.com:katsuhiro/test