Updated sorting | fix #11