EXTREMELY buggy Ninja code
Merge pull request #116 from SamCroswell/master

EXTREMELY buggy Ninja code