#102 Feature complete, Tests still missing
#102 Added some tests. Still some missing
merge Dolphins into #102
Merge pull request #168 from hpi-swt2/D/feature/#102

D/feature/#102