Merge branch 'ozamasa-master'