Fxing issue #301 with full details
Merge pull request #1142 from charanlekkalapudi/master

Fxing issue #301 with full details