added some location logic
Merge branch 'master' of https://github.com/djuta/scotch-finder