Merge pull request #257 from luixxiul/development

Development
Merge pull request #259 from luixxiul/development

Development
Merge pull request #261 from luixxiul/development

Development
search input corrected