Added initial support for Location
Merge remote-tracking branch 'origin/master'