AH: Cleaning up onLocationChanged
Merge branch 'master' of https://github.com/gemmiller/0xDEADBEEF