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

Feature/emr 8
small change