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

more changes