Added German support, changed some small things around.
Merge remote-tracking branch 'origin/master'