ok let's make here an official patch, without debugging code
remove comments and debug code

and oops wrong filename commited previously
indent and other crap