Mike commit
Merge remote-tracking branch 'choose_remote_name/master'
Mike

- merged and fix a little of dialog box