US5555: Adding awesome search
Merge branch 'StepTres'