problems of shadowed variables solved
conflicts resolved
resolve conflicts
Merge pull request #723 from isivigno/DSLsubsegmentRelease

DSLSubsegment - problems of shadowed variables solved