[Pooja/Faris] Added the latest code.
Merge pull request #1 from farismosman/master

[Pooja/Faris] Added the latest code.