Location set
Merge pull request #395 from ping19/master

Location set