Merge pull request #10 from kminhc/master

TobiasBranch merge from master
FastFertigGUIALJDPASJD
Merge pull request #12 from kminhc/TobiasBranch

Tobias branch