Added 18 and 67
Merge branch 'master' of https://github.com/ironclad00/ninja
Added 18 and 67