Timeout added and some changes
Merge branch 'master' of https://github.com/rasp-home/android-positioning