Merge pull request #289 from jakob-r/master

Fix collape_rows for arbitrary columns