better string stream dialogs
Merge origin/master