Merge pull request #1 from hkayesh/production

Production merge to master