Issue#303
Merge pull request #306 from anoopsjohn/master

Fix for Issue#303