Merge pull request #230 from SGA-Brookshire/master

first pass e2-0008
first pass e2-0010