add new feature
fix bug of new feature
fix bug and update test1
fixed bug at master while develop new feature test4
finish new feature test4
Merge branch 'new_feature'