Updated to Support android 4.3