Improve search functions
Fix #177 implement lua version
Fix for review
Merge branch 'if_lua'