Fixed executor layout
Merge pull request #52 from peter-volkov/greg_fix_executor_layout

Fixed executor layout