add new in feature_1.0 branch
merge feature 1.0 to B