BATCH-1995: Updated to handle delimitors at the beginning and end of a l...

...ine