Sub underbars for spaces
Merge branch 'copy' into gb_master