Fixing Issue_407
Merge pull request #45 from michaelhidalgo/Issue_407

Fixing Issue_407