Work towards resolving DE238
finish code for DE238
fix merge conflict
Merge pull request #55 from rackerjoe/DE238

Merged automatically by jenkins after successful build test