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

Merge branch 'feature/EMR-1' into develop