first pass e2-0042 djb
Merge pull request #257 from SGA-Brookshire/master

first pass e2-0042 djb