Minor refactorign
Minor update
Patch for an Issue #958