Feature/runner, fix #6