refine search algorithm
Merge branch 'aji' of github.com:thomasmu/pegimakan into aji