make data file more robust to dropped data
Merge remote branch 'origin/master'