Merge pull request #1 from enthtranslator/master

Pull enthtranslator:master in Vladilen:master
Sorting part 1
Sorting part 2
Merge pull request #10 from Vladilen/Sorting

Sorting