Added functionality to sort on fuzzy search and fix on UTF-8 files
Document functionality added and thanks to Narango
merging from upstream

Merge remote-tracking branch 'upstream/master'