first pass e2-0032 djb
Merge pull request #245 from SGA-Brookshire/master

first pass e2-0032 djb