Merge pull request #24 from dubdabasoduba/feature/EMR-6

edit