Merge 'master' branch of ccocchi