Fix coordinates format
Add location setting ability
_location
Merge with upstream