Feature/4/reprocess

Included Jan's feedback for reprocess option.