Merge pull request #21 from yashmehrotra/production

[ROUTINE-MERGE]  From Production
Merge pull request #22 from yashmehrotra/staging

[ROUTINE-MERGE]  From Staging - Aug-30