Merge pull request #521 from Mik13/master

Use correct namespaces for elements with base.