Merge pull request #1 from GanisEnder/branch1

aaaaaaaaaaaaaaaaaaaaaaa
Revert "aaaaaaaaaaaaaaaaaaaaaaa"
Merge pull request #2 from wnow20/revert-1-branch1

Revert "aaaaaaaaaaaaaaaaaaaaaaa"
second commit