changed something
Test stuff added
Merge remote-tracking branch 'origin/Hans' into Lappy