Updated for Lollipop release and fixed some bugs, see the Change List
for details