Fixing Issue_458
Merge pull request #48 from michaelhidalgo/Issue_458

Fixing Issue_458