commit from Andra
Merge branch 'master' of https://github.com/radudar/common-repository