handle DEBUG assertion issues
Merge branch 'master' of https://github.com/rttag/Collage