Merge pull request #14 from OddBloke/master

Now works on Travis!
Use a DEBUG global variable instead of commenting debug code.