merger code from master to newbranch