Finish branch 1

test branch 1
Merge pull request #2 from woodpecker12/test-branch-1

Finish branch 1,fixes # 1