Better handling of collection reordering (with doubles)
Merge pull request #67 from Kricket/master

Better handling of collection reordering (with doubles)