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

Feature dialog