see #339
added confirmation dialog (see #332)
Merge remote-tracking branch 'origin/master'