Merge pull request #72 from Baachi/master

Remove composer.lock from the repository
Improve the SearchManager
Fix docblock
Merge pull request #73 from Baachi/searchmanager

Fix the sarchmanager
Merge pull request #74 from Baachi/metadata

Update metadata
Fix conflict