Merge pull request #10 from MedibaWorkshop/feature/dev-ph1

Feature/dev ph1