Revert "Revert EchoDev's commit until I get permission from YePpHa or he merges it himself."
Merge pull request #1146 from YePpHa/revert-1141-revert-1127-patch-1

Revert "Revert EchoDev's commit until I get permission from YePpHa or he...