Namespace switch attrs
Merged upstream pull request #108, slightly modified