Test Eric Changes

Test Eric Changes
Merge branch 'ericjohson'