Please let me know if this updated version just posted to BCL works for you. https://bcl.nrel.gov/node/84671