SortFilter added but needs modify
Merge branch 'master' of https://github.com/mustafatasdemir/A1_ESE