Location extractor
Merge branch 'master' of https://github.com/chriswait91/smartHack