Fixing Issue_534
Merge pull request #93 from michaelhidalgo/Issue_534

Fixing Issue 534