Merge pull request #88 from Zearin/master

runner: variable name tweaks
runner: determine excluded items *first*