data loader updates (location calls finished)
Merge remote-tracking branch 'origin/master'