shw's commit

need to merge it to master