Feature/runner, fix #6

fix #6