created fixes for issue SS-392
Merge pull request #36 from poshtha/master

Added fixes for issue SS-392