FIX for issue 734, fixed ordering using an OrderedHash
Merge pull request #959 from akwok18/issue-734

FIX for issue 734, fixed ordering using an OrderedHash
Closes #734