Error fixed.
Merge pull request #784 from anilgooru/dev-branch

Error fixed.
Merge pull request #785 from Gooru/dev-branch

Error fixed.