Merge pull request #3 from SalamandraDevs/revert-1-testpatch