temp commit
Added more sort options
Added more sort options
Merge remote-tracking branch 'origin/master'