Changed Indicator/Type to allow for specifying multiple Types

Changed Indicator/Type to allow for specifying multiple Types
Close issue #58