Fixing Issue_527
Merge pull request #82 from michaelhidalgo/Issue_527

Fixing Issue_527