Makes cci options additive instead of mutual exclusive

This should resolve #28.