Merge pull request #36 from dragos-dumi/master

Synced with production