add descriptor fields
emulator fix
Merge branch 'master' of https://github.com/ang1ee/CarFollowingApp