Added DTD files agai
Add lost assertion macro again
Merge branch 'master' into develop