Made the constraints class derived from the base characteristics
Merge remote-tracking branch 'origin/master'