reconciling merge issues
Merge branch 'master' of https://github.com/Grub0/TEAMS-Module