Fixed default sorting [Closed #31]