Merge pull request #3 from lassem/feature/dialogsupport

Feature/dialogsupport