Fixes bug 1099253 - Final commit
Merge pull request #135 from anurag90x/Bug#1099253

Fix for Bug#1099253