Added location fields to the CSV export. Closes #120.