Merge pull request #39 from TeToNN/teambuilder

Teambuilder
Merge remote-tracking branch 'upstream/master' into teambuilder