Merge pull request #8 from MoMaT/master

Team2 wonderful code added.
Unfinished and slightly buggy version of Team4 code.