Merge pull request #4 from 90arther/feature-dialog

Feature dialog
Merge pull request #5 from 90arther/develop

Merge pull request #4 from 90arther/feature-dialog