additional features
Merge branch 'master' of https://github.com/ggeorgiou2/BSGTeam