Added advanced search for self instruction
Merge branch 'master'