Merge pull request #5 from Redeement/master

tjyfhjjy
Merge pull request #7 from Redeement/Red's-Branch

Merge pull request #5 from Redeement/master