Refactor runner
Merge pull request #104 from troopjs/feature/runner

Refactor runner