Merge pull request #15 from dubdabasoduba/feature/EMR-2

Feature/emr 2