Added more robust ControlParameter detection.
Merge pull request #194 from gilles-leblanc/ControlParameter_detector

Added more robust ControlParameter detection.