Updated to most recent change (10/8) from J.S.

Copied into Kevin's Forked Repo