Feature testing branche

Merge test branch with sort function into master