Added support for column ordering, updated tests and docs