Affordable location functionality added
Merge