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

Feature/emr 8