Merge pull request #42 from Alghayma/production

Production
Merge pull request #43 from Alghayma/production

Production
Merge pull request #44 from Alghayma/master

Rebasing