Merge pull request #16 from szabgab/main

updating main
sort is back
removed obsolete var
Merge pull request #57 from EitanSchuler/main

fixed sort