Now prompting for location if no location
Merge remote-tracking branch 'Github/master'