master<-kinouchi_fix
changed
kinouchi