FIX getLocation using simple way
Merge branch 'develop' into feature/compass