first pass e2-0054 djb
Merge pull request #260 from SGA-Brookshire/master

first pass e2-0054 djb