Consistent spacing
Merge branch 'dev_michael' of github.com:CPLUG/cpc into dev_michael