Maria added her sort function
Merge branch 'm_branch' into develop