added support for android 2.1