Fixing Issue_517
Merge pull request #81 from michaelhidalgo/Issue_517

Fixing Issue 517