fixed null pointer exception
uped version
updated to android 21