Merge pull request #212 from jerv13/master

Dialog Bug fix
Merge remote-tracking branch 'upstream/master'