Merging.

Merge branch 'master' of github.com:azureblue/cec

Conflicts:
	man/cec.Rd
Merge branch 'master' of github.com:azureblue/cec

Conflicts:
	man/cec.Rd