Merge branch 'master' of https://github.com/kuriyama1984/ninjaTest

Conflicts: