Merge palmtoy:master to zgli:master