collapse update
Merge pull request #808 from solispauwels/master

collapse update