Fixing Issue_285
Merge pull request #84 from michaelhidalgo/Issue_285

Issue 285