Updated search function
Merge branch 'development' of github.com:HanWax/so_close into development