Better dialogue options
Merge branch 'master' of github.com:majdal/modex