Added support for Android 2.3