Making collapsing optional
Merge pull request #65 from rossimo/master

Making collapsing optional