Merged in upstream updates

Hi, Kevin.

I'd just like to share my recent updates to your branch, to keep it in sync with upstream changes.