Merge original configs with OEM
Merge pull request #92 from jlewin/development

Merge original configs with OEM