Adds code to resume failed processing. Removes a buggy regex.
Merge remote-tracking branch 'origin/master'