Merge pull request #244 from SGA-Brookshire/master

first pass e2-0028 djb
first pass e2-0032 djb