update Location
Merge pull request #37 from csmalin/merge-master

update Location