Commit from Asus WebDesign JavaJam4