Merge branch 'tatsuya'