fix given by Fayaza for SS-395 commited.
fix given by Fayaza for SS-395 commited. Added another similar fix too.
Merge pull request #25 from bhathiya/master

Fix for SS-395