Merge pull request #196 from dreamteam69/master

Resolves #173, added in debug toggles