cleaned up template
Merge branch 'exec_plugin'