Merge pull request #6 from dubdabasoduba/feature/EB-1

Feature/eb 1