commit By Hirotn
Merge branches 'master' and 'new-branch'