Fixing Issue_474
Merge pull request #86 from michaelhidalgo/Issue_474

Fixing Issue 474