Merge pull request #5 from Redeement/master

tjyfhjjy