Merge pull request #1 from StrGlee/test1.0

test1.0