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

Feature/emr 6