Fixing issue #257
Merge pull request #262 from meganap/agut_issue_257

Fixing issue #257