Fix ordering
Merge pull request #85 from theodi/feature-fix-ordering

Fix ordering