Merge pull request #210 from jerv13/master

Refactor dialog