Updated to support android 4.0 version