accepting cc's version
manually updating cc's changes
Merge branch 'ccubed-master'