Some more work on additional settings
Merge branch 'master' of git@github.com:Wohlhabend-Networks/PlatGEnWohl.git