added namespace attributes
added namespacing attributes
fixed address
Merge pull request #47 from ajstanley/7.x

Added some namespacing