Merge branch 'dev-nd' into dev-ma
Merge branch 'master' into dev-ma
Search implementation started
Merge pull request #7 from mikhail-aksenov/dev-ma

Dev ma merging to the master