Added handling of blank rows.