One of this two is the actual implementation of the feature, the other one is mainly to correct bugs I introduced with a previous patch ... ok ok ... I know, I should stop writing code at late night ...

Both patches have to be applied over all the others I sent yesterday

73 de IZ3GME Marco