misplaced elements and missing namespace
Merge pull request #625 from krabaey/issue-misplaced-elements

misplaced elements and missing namespace