Replacing custom OrderedDict with standard python version

This pull request resolves issue #341.