Merge pull request #184 from observerly/feature/internal/utils/Extrac…

Merge pull request #184 from observerly/feature/internal/utils/Extrac… #95