Fixed default callback when locations are changed between calls
Merge remote-tracking branch 'origin/master'