Merge pull request #1 from karip/master

Merge changes from original repo
Updated German translation
Merge pull request #8 from jklingen/master

Updates for German translation