Merge pull request #7 from nZEDb/dev

Dev
a few more changes to the sorter
Merge pull request #8 from nZEDb/dev

Dev
got some errors
Merge pull request #464 from ugokanain/dev

Dev