Added Android 5.0 Lollipop support