Added option to do full sort.
Merge remote-tracking branch 'origin/master'