+  even more good stuff for location detection
Merge branch 'develop'