More bug fixes. Not it basically works.
Merge branch 'master' of https://github.com/marchold/androidFakerProxy