> +MODULE_AUTHOR("Adrian Fiergolski <Adrian.Fiergolski@cern.ch>");

Authorship for this module because of adding IDs? I'll leave the final
decision to Rodolfo and Peter, but I'd think you are not there yet ;)