Location option changes
Merge pull request #188 from AamAadmiParty/akshat/issue_174

Location option changes