Fixed the dme. Code now compiles.
Merge branch 'master' into paperhatfix