Various expansions and language adjustments
Merge pull request #16 from hampelm/master

Various expansions and language adjustments