Merge & modify pull request #46 from DerGenaue/master (add German)