fix geoloc fo
Merge remote branch 'upstream/master'
add values demo v2