Oops...

Follows the updated patch with the suggestions... Please ignore the
previous patch, i was working with an outdated version.

I'll send the other pieces next.

Regards,
Luis