Merge pull request #44 from cptmashek/master

Changesa
Made a few tweaks to the debug options
Merge pull request #46 from cptmashek/master

Fixing barfness