Merge pull request #5 from manojgn/feature-dev-bugFix

Fix for Bug : 1328085