Repo order refector

Fixes issue #13