Dan Walsh
Adding additional improvements & refinements
9e707a5