modify something
Merge branch 'master' of github.com:amaretto/new-hiyoshi