Proposed merge

Pulled together Jeff's and Daren's latest and added small fix of my own...