Finish branch 1,fixes # 1

test branch 1