added minor support for android 2.1