Merge branch 'fix_verbose_flag'