Improved search capabilities
Merge branch 'master' of https://github.com/TheAlbatross279/Gustafo