Add handling for runner and wheel
Merge pull request #91 from pass-by-value/runner_and_wheel_addons

Add handling for runner and wheel