Refactoring
+ clipPath handling added to demo app