Merge branch 'atsushi'