Update comment
Fix an unsuccessful merge
Add index parameter to test script
Merge branch 'master' into issue-533-umlaute