adds location functionality
fixes id
Merge pull request #7 from acz15/master

Add location functionality