Fix cell merging, #179
Merge pull request #296 from jurriaan/fix-cell-merge

Fix cell merging, #179