Ensuring columns saved to file in correct order
Merge branch 'master' into development