Merge pull request #42 from dubdabasoduba/feature/EMR-8

Feature/emr 8
Merge pull request #43 from dubdabasoduba/feature/EMR-8

Feature/emr 8