Dialog fixes
Merge pull request #8 from yoavst/master

Dialog fixes