patch to close #221
Merge remote-tracking branch 'jorisd/run_batch' into development