Use sort_order closes #15