updated data
Merge branches 'sandra' and 'master'