Synced with production
Merge pull request #6 from cristiroma/master

Synced with production