merge from .zip download of jerry's latest commit
git pull after git reset 60e9f855744e3b042d1db71516535771ae329151 to allow my changes
used a zip to force merge to jakes latest work