Don't rely on object iteration order!
Merge pull request #1 from barneycarroll/master

Don't rely on object iteration order!