Fix history
Merge with osmdroid
Merge with osmdroid