ticket:5 fixed all bags
ticket:5 fixed all test OK
ticket:3 merge master