Fixing issue_295
Rewording of the comment and adding a new test case for the feature added
Merge pull request #297 from josenavas/issue_295

Fixing issue_295