Merging dian_newBranch and master