Merged krakjoe's PR
Removed debug messages