Updated the changes to work with the new repo structure.
Merge pull request #468 from spenceralger/numeric-sort

Fixes for #466
Merge remote-tracking branch 'upstream/master'