Issue #488 Implementation of teams - Corrections

Hi,

I have sent you the corrections of implementation of teams. I'll hope corrected all your last issues

Best Regards