Merge branch 'master' of github.com:d-ikeda/pushtest1