Update dialog
Merge remote-tracking branch 'upstream/master'
Merge pull request #217 from jerv13/master

Update dialog