Merge pull request #1110 in master
Merge pull request #1109 in master
Fix typo in en part
Fix typo in de version
Merge pull request #1111
Merge pull request #1111 in develop