Added android 2.3 compatibility