Fix the warning that complains about the use of OrderedDict.
Merge pull request #33 from Hudon/fix-ordereddict-warning

Fix the warning that complains about the use of OrderedDict.