Merge branch 'ordering' into 'master'

Fix issue #9

Closes #9

See merge request !1
1 job for master in 24 seconds (queued for 931 minutes and 9 seconds)