anti-tracking stuff
updated for new locaiton
Merge pull request #14 from MASGAU/develop

Develop