correct file direction
Merge branch 'master' into ishinomaki-1.0