Update v.1.0.9

Sorting fix and some minor optimization