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

minor changes