Ninja Fixes
Merge pull request #98 from SamCroswell/master

Ninja Tweaks