Merge pull request #258 from SGA-Brookshire/master

first pass e2-0052 and 53, djb
first pass e2-0054 djb