Merge pull request #6 from nZEDb/dev

Dev
further clean up of sorter
Merge pull request #448 from ugokanain/dev

Dev