Comment and uncomment

I changed the 'onlyif' in the comment and uncomment, I think that in this way is more simple and works better, because before the uncomment command is executed always.

Regards.