Synced with production
Merge pull request #11 from dragos-dumi/master

Synced with production