Merge pull request #1 from boylea/master

Added user location
add querying
fix conflict