first pass e2-0020 djb
Merge pull request #238 from SGA-Brookshire/master

first pass e2-0020 djb