Better parsing for namespace tags.
Closes #220