verbose option
Merge branch 'master' into ubuntu