Merge branch 'master' into dev-ma
Search implemented
Merge pull request #16 from mikhail-aksenov/dev-ma

Search implemented