Sort data according to #208 discussion

See #208 and commit logs.