fix for SS-287
Merge pull request #37 from bhathiya/master

fix for SS-287