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

Feature/emr 8