Added column-span

Fixes #1131