Merge pull request #16 from nicori-n-team/dev-takakura

Dev takakura