Previous commit failed?
Removed debug code
Merge pull request #110 from Geofff/master

Previous merge did not include everything