Merge pull request #9 from dubdabasoduba/master

Merge pull request #8 from dubdabasoduba/develop
more changes
Merge pull request #10 from dubdabasoduba/feature/DMS-1

more changes