Merge branch 'daniel/columns'