deanlaw Merge pull request #116 from deanlaw/master

Renamed variables named final for CF 2018 reserved word compatibility.

c534cba