Introduced some changes from the noss branch.
Introduced some changes from the noss branch.

danlurie/C-PAC,roijo/C-PAC_complexitytools,danlurie/C-PAC,roijo/C-PAC_complexitytools,danlurie/C-PAC,roijo/C-PAC_complexitytools,danlurie/C-PAC,roijo/C-PAC_complexitytools