Fixing Issue 462
Merge pull request #80 from michaelhidalgo/Issue_462

Fixing Issue 462