master restored
bug fixed
merged branch2