Added peacock_verbose option
Merge branch 'gh11'