Fix column ordering
Merge branch 'master' of github.com:axiak/dullahan

* 'master' of github.com:axiak/dullahan:
  Cross platform