rework of 2D contour drawing - usage of Combine macro
Merge pull request #453 from ffrensch/master

rework of 2D contour drawing - usage of Combine macro