merging the "adding-sorts" branch with master