Merge branch 'develop' of github.com:reyez/ninja into develop
Merge branch 'develop' of github.com:reyez/ninja into develop