Fixes #9
First ConfigDialog version according to #3
Merge branch 'master' into GraphicsWidget