Updated CompositeIndicatorExpression/Indicator to more closely align wit...

...h IndicatorType annotation.
Close issue #32