Added support to Android 5.0 (Lollipop)