fix?
Merge branch 'david' of github.com:Vikko/Locationmanager_extension into david