Decorator update
Changed MainRunner to DecoratorTemplate
Merge branch 'decorator' into develop