Merge pull request #7 from KrauseStefan/DevelopmentKrause

Development krause
Merge remote-tracking branch 'origin/master' into DevelopmentKrause