Use OrderedDict to ease debugging
Merge pull request #5 from dougmassay/python2and3

Python2and3