Issue 592

Fixing issue 592 https://github.com/michaelhidalgo/Dev/compare/Issue_592