Merge pull request #217 from mhotan/master

Fixes to dialogs