Update to work with android 5.0 - lollipop