Fixed the sorting
Merge branch 'develop'