Hack/fix to allow hyphen and underscore in element name to generate xml
Merge branch 'release-0.1.5'