tamed master
master restored
bug fixed
merged branch1