Merge pull request #5 from twokul/getlocation

Adds getLocation