contrib: added generator-wrapping to wrap(..), added 'thunk' handling to runner(..), closes #50 closes #52