Merge pull request #6 from 7footmoustache/master

Fixes sorting of the results of expand based on newer key value structure