droid-identify refactored
Merge origin/master